inspector: Drop the per-object CSS editor

The global editor is good enough for all uses.

diff --git a/gtk/inspector/css-editor.c b/gtk/inspector/css-editor.c
index bdfe762edd626c774e0796708a3a485915c6173d..4e1c40cf70d26c1a2194d75f5fea5270508fdcb2 100644 (file)
--- a/gtk/inspector/css-editor.c
+++ b/gtk/inspector/css-editor.c
@@ -36,36 +36,12 @@
 #include "gtktooltip.h"
 #include "gtktextiter.h"
 
-#define GTK_INSPECTOR_CSS_EDITOR_TEXT "inspector-css-editor-text"
-#define GTK_INSPECTOR_CSS_EDITOR_PROVIDER "inspector-css-editor-provider"
-
-enum
-{
-  COLUMN_ENABLED,
-  COLUMN_NAME,
-  COLUMN_USER
-};
-
-enum
-{
-  PROP_0,
-  PROP_GLOBAL
-};
-
-typedef struct
-{
-  gboolean enabled;
-  gboolean user;
-} GtkInspectorCssEditorByContext;
 
 struct _GtkInspectorCssEditorPrivate
 {
   GtkWidget *view;
-  GtkWidget *object_title;
   GtkTextBuffer *text;
   GtkCssProvider *provider;
-  gboolean global;
-  GtkStyleContext *context;
   GtkToggleButton *disable_button;
   guint timeout;
   GList *errors;
@@ -126,9 +102,6 @@ query_tooltip_cb (GtkWidget             *widget,
   return FALSE;
 }
 
-static void gtk_inspector_css_editor_remove_dead_object (gpointer  data,
-                                                         GObject  *dead_object);
-
 G_DEFINE_TYPE_WITH_PRIVATE (GtkInspectorCssEditor, gtk_inspector_css_editor, GTK_TYPE_BOX)
 
 static void
@@ -136,25 +109,16 @@ set_initial_text (GtkInspectorCssEditor *ce)
 {
   const gchar *text = NULL;
 
-  if (ce->priv->context)
-    text = g_object_get_data (G_OBJECT (ce->priv->context), GTK_INSPECTOR_CSS_EDITOR_TEXT);
   if (text)
     gtk_text_buffer_set_text (GTK_TEXT_BUFFER (ce->priv->text), text, -1);
   else
     {
       gchar *initial_text;
-      if (ce->priv->global)
-        initial_text = g_strconcat ("/*\n",
-                                    _("You can type here any CSS rule recognized by GTK+."), "\n",
-                                    _("You can temporarily disable this custom CSS by clicking on the “Pause” button above."), "\n\n",
-                                    _("Changes are applied instantly and globally, for the whole application."), "\n",
-                                    "*/\n\n", NULL);
-      else
-        initial_text = g_strconcat ("/*\n",
-                                    _("You can type here any CSS rule recognized by GTK+."), "\n",
-                                    _("You can temporarily disable this custom CSS by clicking on the “Pause” button above."), "\n\n",
-                                    _("Changes are applied instantly, only for this selected widget."), "\n",
-                                    "*/\n\n", NULL);
+      initial_text = g_strconcat ("/*\n",
+                                  _("You can type here any CSS rule recognized by GTK+."), "\n",
+                                  _("You can temporarily disable this custom CSS by clicking on the “Pause” button above."), "\n\n",
+                                  _("Changes are applied instantly and globally, for the whole application."), "\n",
+                                  "*/\n\n", NULL);
       gtk_text_buffer_set_text (GTK_TEXT_BUFFER (ce->priv->text), initial_text, -1);
       g_free (initial_text);
     }
@@ -165,25 +129,12 @@ disable_toggled (GtkToggleButton       *button,
                  GtkInspectorCssEditor *ce)
 {
   if (gtk_toggle_button_get_active (button))
-    {
-      if (ce->priv->global)
-        gtk_style_context_remove_provider_for_screen (gdk_screen_get_default (),
-                                                      GTK_STYLE_PROVIDER (ce->priv->provider));
-      else if (ce->priv->context)
-        gtk_style_context_remove_provider (ce->priv->context,
-                                           GTK_STYLE_PROVIDER (g_object_get_data (G_OBJECT (ce->priv->context), GTK_INSPECTOR_CSS_EDITOR_PROVIDER)));
-    }
+    gtk_style_context_remove_provider_for_screen (gdk_screen_get_default (),
+                                                  GTK_STYLE_PROVIDER (ce->priv->provider));
   else
-    {
-      if (ce->priv->global)
-        gtk_style_context_add_provider_for_screen (gdk_screen_get_default (),
-                                                   GTK_STYLE_PROVIDER (ce->priv->provider),
-                                                   GTK_STYLE_PROVIDER_PRIORITY_USER);
-      else if (ce->priv->context)
-        gtk_style_context_add_provider (ce->priv->context,
-                                        GTK_STYLE_PROVIDER (g_object_get_data (G_OBJECT (ce->priv->context), GTK_INSPECTOR_CSS_EDITOR_PROVIDER)),
-                                        G_MAXUINT);
-    }
+    gtk_style_context_add_provider_for_screen (gdk_screen_get_default (),
+                                               GTK_STYLE_PROVIDER (ce->priv->provider),
+                                               GTK_STYLE_PROVIDER_PRIORITY_USER);
 }
 
 static gchar *
@@ -268,21 +219,13 @@ save_clicked (GtkButton             *button,
 static void
 update_style (GtkInspectorCssEditor *ce)
 {
-  GtkCssProvider *provider;
   gchar *text;
 
-  if (ce->priv->global)
-    provider = ce->priv->provider;
-  else if (ce->priv->context)
-    provider = g_object_get_data (G_OBJECT (ce->priv->context), GTK_INSPECTOR_CSS_EDITOR_PROVIDER);
-  else
-    return;
-
   g_list_free_full (ce->priv->errors, css_error_free);
   ce->priv->errors = NULL;
 
   text = get_current_text (ce->priv->text);
-  gtk_css_provider_load_from_data (provider, text, -1, NULL);
+  gtk_css_provider_load_from_data (ce->priv->provider, text, -1, NULL);
   g_free (text);
 
   gtk_style_context_reset_widgets (gdk_screen_get_default ());
@@ -351,52 +294,22 @@ show_parsing_error (GtkCssProvider        *provider,
 static void
 create_provider (GtkInspectorCssEditor *ce)
 {
-  GtkCssProvider *provider = gtk_css_provider_new ();
-
-  if (ce->priv->global)
-    {
-      ce->priv->provider = provider;
-      gtk_style_context_add_provider_for_screen (gdk_screen_get_default (),
-                                                 GTK_STYLE_PROVIDER (ce->priv->provider),
-                                                 GTK_STYLE_PROVIDER_PRIORITY_USER);
-    }
-  else if (ce->priv->context)
-    {
-      gtk_style_context_add_provider (ce->priv->context,
-                                      GTK_STYLE_PROVIDER (provider),
-                                      G_MAXUINT);
-      g_object_set_data_full (G_OBJECT (ce->priv->context),
-                              GTK_INSPECTOR_CSS_EDITOR_PROVIDER, provider,
-                              g_object_unref);
-    }
+  ce->priv->provider = gtk_css_provider_new ();
+  gtk_style_context_add_provider_for_screen (gdk_screen_get_default (),
+                                             GTK_STYLE_PROVIDER (ce->priv->provider),
+                                             GTK_STYLE_PROVIDER_PRIORITY_USER);
 
-  g_signal_connect (provider, "parsing-error",
+  g_signal_connect (ce->priv->provider, "parsing-error",
                     G_CALLBACK (show_parsing_error), ce);
 }
 
 static void
 destroy_provider (GtkInspectorCssEditor *ce)
 {
-  if (ce->priv->global)
-    {
-      gtk_style_context_remove_provider_for_screen (gdk_screen_get_default (),
-                                                    GTK_STYLE_PROVIDER (ce->priv->provider));
-      g_object_unref (ce->priv->provider);
-      ce->priv->provider = NULL;
-    }
-  else if (ce->priv->context)
-    {
-      GtkStyleProvider *provider;
-
-      provider = g_object_get_data (G_OBJECT (ce->priv->context),
-                                    GTK_INSPECTOR_CSS_EDITOR_PROVIDER);
-      gtk_style_context_remove_provider (ce->priv->context, provider);
-      g_object_set_data (G_OBJECT (ce->priv->context),
-                         GTK_INSPECTOR_CSS_EDITOR_PROVIDER,
-                         NULL);
-    }
+  gtk_style_context_remove_provider_for_screen (gdk_screen_get_default (),
+                                                GTK_STYLE_PROVIDER (ce->priv->provider));
+  g_clear_object (&ce->priv->provider);
 }
-  
 
 static void
 gtk_inspector_css_editor_init (GtkInspectorCssEditor *ce)
@@ -414,46 +327,6 @@ constructed (GObject *object)
   set_initial_text (ce);
 }
 
-static void
-get_property (GObject    *object,
-              guint       param_id,
-              GValue     *value,
-              GParamSpec *pspec)
-{
-  GtkInspectorCssEditor *ce = GTK_INSPECTOR_CSS_EDITOR (object);
-
-  switch (param_id)
-    {
-      case PROP_GLOBAL:
-        g_value_set_boolean (value, ce->priv->global);
-        break;
-
-      default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, param_id, pspec);
-        break;
-    }
-}
-
-static void
-set_property (GObject      *object,
-              guint         param_id,
-              const GValue *value,
-              GParamSpec   *pspec)
-{
-  GtkInspectorCssEditor *ce = GTK_INSPECTOR_CSS_EDITOR (object);
-
-  switch (param_id)
-    {
-      case PROP_GLOBAL:
-        ce->priv->global = g_value_get_boolean (value);
-        break;
-
-      default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, param_id, pspec);
-        break;
-    }
-}
-
 static void
 finalize (GObject *object)
 {
@@ -463,14 +336,6 @@ finalize (GObject *object)
     g_source_remove (ce->priv->timeout);
 
   destroy_provider (ce);
-  if (ce->priv->context)
-    {
-      g_object_weak_unref (G_OBJECT (ce->priv->context), gtk_inspector_css_editor_remove_dead_object, ce);
-      g_object_set_data (G_OBJECT (ce->priv->context),
-                         GTK_INSPECTOR_CSS_EDITOR_TEXT,
-                         NULL);
-      ce->priv->context = NULL;
-    }
 
   g_list_free_full (ce->priv->errors, css_error_free);
 
@@ -483,77 +348,17 @@ gtk_inspector_css_editor_class_init (GtkInspectorCssEditorClass *klass)
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
-  object_class->get_property = get_property;
-  object_class->set_property = set_property;
   object_class->constructed = constructed;
   object_class->finalize = finalize;
 
-  g_object_class_install_property (object_class, PROP_GLOBAL,
-      g_param_spec_boolean ("global", "Global", "Whether this editor changes the whole application or just the selected widget",
-                            TRUE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
-
   gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/inspector/css-editor.ui");
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorCssEditor, text);
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorCssEditor, view);
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorCssEditor, disable_button);
-  gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorCssEditor, object_title);
   gtk_widget_class_bind_template_callback (widget_class, disable_toggled);
   gtk_widget_class_bind_template_callback (widget_class, save_clicked);
   gtk_widget_class_bind_template_callback (widget_class, text_changed);
   gtk_widget_class_bind_template_callback (widget_class, query_tooltip_cb);
 }
 
-static void
-gtk_inspector_css_editor_remove_dead_object (gpointer data, GObject *dead_object)
-{
-  GtkInspectorCssEditor *ce = data;
-
-  ce->priv->context = NULL;
-  gtk_widget_hide (GTK_WIDGET (ce));
-}
-
-void
-gtk_inspector_css_editor_set_object (GtkInspectorCssEditor *ce,
-                                     GObject               *object)
-{
-  gchar *text;
-  GtkCssProvider *provider;
-  const gchar *title;
-
-  g_return_if_fail (GTK_INSPECTOR_IS_CSS_EDITOR (ce));
-  g_return_if_fail (!ce->priv->global);
-
-  if (ce->priv->context)
-    {
-      g_object_weak_unref (G_OBJECT (ce->priv->context), gtk_inspector_css_editor_remove_dead_object, ce);
-      text = get_current_text (GTK_TEXT_BUFFER (ce->priv->text));
-      g_object_set_data_full (G_OBJECT (ce->priv->context),
-                              GTK_INSPECTOR_CSS_EDITOR_TEXT,
-                              text, g_free);
-      ce->priv->context = NULL;
-    }
-
-  if (!GTK_IS_WIDGET (object))
-    {
-      gtk_widget_hide (GTK_WIDGET (ce));
-      return;
-    }
-
-  gtk_widget_show (GTK_WIDGET (ce));
-
-  title = (const gchar *)g_object_get_data (object, "gtk-inspector-object-title");
-  gtk_label_set_label (GTK_LABEL (ce->priv->object_title), title);
-
-  ce->priv->context = gtk_widget_get_style_context (GTK_WIDGET (object));
-
-  provider = g_object_get_data (G_OBJECT (ce->priv->context), GTK_INSPECTOR_CSS_EDITOR_PROVIDER);
-  if (!provider)
-    create_provider (ce);
-
-  set_initial_text (ce);
-  disable_toggled (ce->priv->disable_button, ce);
-
-  g_object_weak_ref (G_OBJECT (ce->priv->context), gtk_inspector_css_editor_remove_dead_object, ce);
-}
-
 // vim: set et sw=2 ts=2:

diff --git a/gtk/inspector/window.c b/gtk/inspector/window.c
index 66f226d89dfc26c461b4b411ae891835c09f815c..8edc03a4175976ac5fe527cf371f9ed4bba7cec0 100644 (file)
--- a/gtk/inspector/window.c
+++ b/gtk/inspector/window.c
@@ -67,7 +67,6 @@ set_selected_object (GtkInspectorWindow *iw,
   gtk_inspector_object_hierarchy_set_object (GTK_INSPECTOR_OBJECT_HIERARCHY (iw->object_hierarchy), selected);
   gtk_inspector_selector_set_object (GTK_INSPECTOR_SELECTOR (iw->selector), selected);
   gtk_inspector_misc_info_set_object (GTK_INSPECTOR_MISC_INFO (iw->misc_info), selected);
-  gtk_inspector_css_editor_set_object (GTK_INSPECTOR_CSS_EDITOR (iw->widget_css_editor), selected);
   gtk_inspector_css_node_tree_set_object (GTK_INSPECTOR_CSS_NODE_TREE (iw->widget_css_node_tree), selected);
   gtk_inspector_size_groups_set_object (GTK_INSPECTOR_SIZE_GROUPS (iw->size_groups), selected);
   gtk_inspector_data_list_set_object (GTK_INSPECTOR_DATA_LIST (iw->data_list), selected);
@@ -223,7 +222,6 @@ gtk_inspector_window_class_init (GtkInspectorWindowClass *klass)
   gtk_widget_class_bind_template_child (widget_class, GtkInspectorWindow, prop_list);
   gtk_widget_class_bind_template_child (widget_class, GtkInspectorWindow, child_prop_list);
   gtk_widget_class_bind_template_child (widget_class, GtkInspectorWindow, signals_list);
-  gtk_widget_class_bind_template_child (widget_class, GtkInspectorWindow, widget_css_editor);
   gtk_widget_class_bind_template_child (widget_class, GtkInspectorWindow, widget_css_node_tree);
   gtk_widget_class_bind_template_child (widget_class, GtkInspectorWindow, object_hierarchy);
   gtk_widget_class_bind_template_child (widget_class, GtkInspectorWindow, selector);

diff --git a/gtk/inspector/window.h b/gtk/inspector/window.h
index c5cbce5aed39e53cf14567c8be3c3e42e2e08ddc..338d781bde4ef40bae0db293221666303c519a92 100644 (file)
--- a/gtk/inspector/window.h
+++ b/gtk/inspector/window.h
@@ -56,7 +56,6 @@ typedef struct
   GtkWidget *signals_list;
   GtkWidget *style_prop_list;
   GtkWidget *classes_list;
-  GtkWidget *widget_css_editor;
   GtkWidget *widget_css_node_tree;
   GtkWidget *object_hierarchy;
   GtkWidget *size_groups;

diff --git a/gtk/inspector/window.ui b/gtk/inspector/window.ui
index 5eaafb8c184be48cee554e051c402e8836f2d58e..52d1898516cf1af3f0c2c36e41966d41a60a2c99 100644 (file)
--- a/gtk/inspector/window.ui
+++ b/gtk/inspector/window.ui
@@ -314,15 +314,6 @@
                             <property name="title" translatable="yes">CSS nodes</property>
                           </packing>
                         </child>
-                        <child>
-                          <object class="GtkInspectorCssEditor" id="widget_css_editor">
-                            <property name="global">False</property>
-                          </object>
-                          <packing>
-                            <property name="name">css</property>
-                            <property name="title" translatable="yes">CSS</property>
-                          </packing>
-                        </child>
                         <child>
                           <object class="GtkInspectorSizeGroups" id="size_groups"/>
                           <packing>
@@ -406,7 +397,6 @@
         <child>
           <object class="GtkInspectorCssEditor">
             <property name="visible">True</property>
-            <property name="global">True</property>
           </object>
           <packing>
             <property name="name">css</property>